From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Sun, 4 Apr 2004 13:59:45 +0000 (+0000)
Subject: * anchor stripping now positively defined, only a few explicitly defined invalid... 
X-Git-Tag: 1.3.0beta1~605
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=0155f1f84e51a7acf6c6517c58d009121fa939a1;p=lhc%2Fweb%2Fwiklou.git

* anchor stripping now positively defined, only a few explicitly defined invalid characters are replaced by _:
$canonized_headline = preg_replace("/[ &\\/<>\\(\\)\\[\\]=,+]+/", '_', html_entity_decode(trim( $canonized_headline )));
* additional fixes for closing p's in tables
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 93d92bda87..bb8dff9475 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -377,9 +377,9 @@ class Parser
 
 						$l = array_pop ( $ltd ) ;
 						if ( array_pop ( $td ) ) $z = "</{$l}>" . $z ;
-						if ( $fc == "|" ) $l = "TD" ;
-						else if ( $fc == "!" ) $l = "TH" ;
-						else if ( $fc == "+" ) $l = "CAPTION" ;
+						if ( $fc == "|" ) $l = "td" ;
+						else if ( $fc == "!" ) $l = "th" ;
+						else if ( $fc == "+" ) $l = "caption" ;
 						else $l = "" ;
 						array_push ( $ltd , $l ) ;
 						$y = explode ( "|" , $theline , 2 ) ;
@@ -418,6 +418,8 @@ class Parser
 
 		# $text = preg_replace( "/(^|\n)-----*/", "\\1<hr>", $text );
 		$text = str_replace ( "<HR>", "<hr />", $text );
+		$text = str_replace ( "<br>", "<br />", $text );
+		$text = str_replace ( "<br >", "<br />", $text );
 
 		$text = $this->doHeadings( $text );
 		
@@ -1025,7 +1027,7 @@ class Parser
 				  "/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<div|<pre)/i", $t ) ) {
 					$text .= $this->closeParagraph();
 					$inBlockElem = true;
-				} else if ( preg_match("/(<hr)/i", $t ) ) {
+				} else if ( preg_match("/(<hr|<\\/td)/i", $t ) ) {
 					$text .= $this->closeParagraph();
 					$inBlockElem = false;
 				}
@@ -1468,8 +1470,7 @@ class Parser
 			# strip out HTML
 			$canonized_headline = preg_replace( "/<.*?" . ">/","",$canonized_headline );
 			
-			$tocline = trim( $canonized_headline );
-			$canonized_headline = preg_replace( "/[^a-z0-9]/i", "_", trim( $canonized_headline ) );
+			$canonized_headline = preg_replace("/[ &\\/<>\\(\\)\\[\\]=,+]+/", '_', html_entity_decode(trim( $canonized_headline )));
 			$refer[$headlineCount] = $canonized_headline;
 			
 			# count how many in assoc. array so we can track dupes in anchors